GLYPH_CODE_FACE returns EMACS_INT, not int.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 13 Jun 2011 05:15:27 +0000 (22:15 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 13 Jun 2011 05:15:27 +0000 (22:15 -0700)
commit5ce2d6a66db6e1f57f45993b64f886f106d01c47
tree29c3d2ff0575c7ca24258ae2bbb7753a83f506cc
parenta3fca175cc85528f7173c41b6eb10e0ba42a22f3
GLYPH_CODE_FACE returns EMACS_INT, not int.

* dispextern.h (merge_faces):
* xfaces.c (merge_faces):
* xdisp.c (get_next_display_element):
(next_element_from_display_vector): Don't assume EMACS_INT fits in int.
src/ChangeLog
src/dispextern.h
src/xdisp.c
src/xfaces.c